Fix some inline issues