Small fixes & renames