Corrected some minor errors made by me (rkatic) in last commits.