Options fixes
Add some more extension methods