#12 Fixes