Additions and fixes

Official additions and fixes from apollo-master and myself.