codesniff fixes for x0r