Bug fixes for LUTs as per Constants email
Bug fixes for LUTs as per Constants email