Random bugfix attempts, unsuccessful as of yet