Fix to offs
Various fixes