Fixed more of Mathias' Fails