empty messages and api fixes