Minor adjustments

Untested, might horribly crash