little bug fixes

Conflicts:
	src/main/scala/aws/AWSInitialization.scala