Squashed some system compatability bugs.