Adding stuff missed from last commit