Fixed some option passing logic