Moar fixes, etc