Small changes... sql alias etc