Fix some small issues here and there