Several issues fixed

Issues mentioned in the email with date 27.01.14