Fixed psi-plus compile warnings