Various fixes
Forgot to push up friday :\