Fix some tiny bugs & problems