Fixing functions and options