Initial hardcoded fixes for RC6