Bug fixes - Enabled shared preferences