Some spf13 changes