Some small changes, switching to 2.5-dev