Bug track fixes