Fixes issues