See previous commit, more fixes