Revert "Some more minor fixes"

This reverts commit e88c3d8e1df2db9d89666c5cb81605330eefab04.