Bug Fixes (#44, #45, #47)