Some fixes III