Fixed two more dumb mistakes - these should compile now (although they have no implementation)