Fixed issues detailed here: http://goo.gl/gRgsUc