Fixes, thanks to @senthil10 for suggesting these