Fixed various stuff