Fixed several stuff