Some fixes.
Merge commit '6aadb552585dec242c2010290f8a61ca16d7b333'
W3A2