More tweaks/fixes

Eyup