patches

Fixed some issues that I came accross