Minor corrections and collectstatic