Fix for startup hook
Fix for layout scripts