Finishing fixes for #6