Some fixes and new complaints