Some allround fixes