Fixed deprecated issues with Morgan