Little tweaks and fixes