Aegolden/misc fixes

Resolves https://github.com/inkling/Subliminal/issues/2