Few fixes/additions.