Minor changes to the winapi controller