Fixes for working