Fixes some bugs detected after E1 final deliverable