Some fixes for #2 and #3