Fix mode issues