Fixed small tweaks