Fixes

First push was not functional