Small fixes in BasicProgramming