Option fixes and additions