Fixed base controller errors