Got rid of warnings and updated storage getters