Patch 1

fix 2 errors 500