Fix some absolute imports