Bug corrections...