Fixes from end-to-end exersize