Fix empty body and type limit warnings