Various small fixes, renaming etc.