Fixed issues: #722, #814, #823

Bug fixes for TC Web Arena PAY PER BUG FIX Challenge 1