I'm seriously bad... - Fixed missing definitions part of merge