Fixed some shenanigans between symbols and strings as hash keys