Some fixes from mentors review