Some more Inline fixing and cleanup