Fixes for typos and etc