Fix some small issues, looking for more