Small fixes and build upload/serving servlets