Unbelievably stupid bugs fixed