API 0.4 Reverted minor errors in changeset 2324