Fixes made for demo preview