[ ! ] Final fixes