Last commit, small fixes