Even more bug-fixes