Adrienne - Some fixes & stubbing