Fixes problems