Fix strict bugs