More fixes, but the strictcpat is not working