Fixing reflection issues pointed in #8 and #11