Really dumb bugs fixed