Fixing some small bugs