BOD-1: PATCH 0.3

Few more bugs fixed