- General fixes