Various fixes from previous work
Merge branch 'master' of github.com:botskonet/aspen-framework