Fixes for several bugs

Fixed:
EDEN-25
EDEN-26
EDEN-27
EDEN-28
EDEN-29