Fix some tiny problems