Master: Bug Fixes