A few more fixes for stuff in the RC

More bugs I've found :)

Once I've got all these fixed I'll submit another pull req against 2014.7