Applied fixes