smal bigfixes