First button enable fixes