Make the errors/warnings more explicit for now so we can easier troubleshoot