Bugfix/fixes from amber