Minor fixes

Just a cleanup