Fixed more bugs

More bugs