(fix) Various errors