Fixed bugs

Again