Fix screencasts... still hacky