Small fixes for r63