Some findbugs fixes in cloud-api project