Fixes and requirements