Small fixes to Input stream class