#20 Fixes