You can also try and keep the bedroom a "cat free" area, so that he doesn't have problems at night.