More stupid bugs fixed.