More fixtures and encoding fix