#11 Fixes after review