Bugfixes! #1 and #2