Even more bugs fixed