Some fixes I found since last Update