Fixes & opts