Moar fixes and stuffs.