#114 Fixed bugs that were introduced when lombok was removed.