Fixed more bugs: