More small tweaks and fixes