Misc technical improvements
