#386: Fixes