Fixed some user blundery