[20170210204814] General Bug Fixes