Re-fix problems
I don't know how or why but somehow these fixes were reverted.