Fix some small issues