fixed build errors, prior to resolving hash map link error