Small fixes for #7 and #5