Small clean/fixes