DDBEASY-45 - Availability fixes.
Merge pull request #5 from guddo/DDBEASY-45

Issue #453 by guddo: Availability types fix.