And another commit, small fixes