Some implementation and include fixies