Time, back & buxs fixes