General fixes - stable