Some magic fixes. Really.