Even more bug fixing ...