Some Fixes for #59 that i forgot