Fixes, to the proper branch

References #49