Fix out of line definition errors