General adds and fixes