Fixes for Guard again

Fixes @options holding the merged values from previous calls to

I've fixed all the failing specs but one where I'm unsure of the cause.