Added spf13 tweaks