Fixes, clean-ups