Fix several base path issues & style fixes