fixed few issues in workshop