MCrypt fixes