Various fixes

Fix dates and require expiration date on opportunities