Fixed human interaction bugs