Fixed minor bugs requested on 12/20/2013

See commit descriptions for more information.