Minor bigfixes