Some more fixes

Also small commit so Rawrity can sync properly on his fork.