Few changes due to THANKS removal...