Fix some simple issues