Keystone support for S3 support

- Various small fixes

Signed-off-by: Roald J. van Loon <roaldvanloon@gmail.com>