Minor updates

Minor changes / fixes that are currently required by the new rock-webapp tool