Api location fixes.