Attempting a fix on some totally random bugs