Dealt with minor warnings