fixes

fixes for:
http://tasks.eternityincurakai.com/projects/39#232 and
http://tasks.eternityincurakai.com/projects/39#231