QuickFix: Fixes for issue #45