Updates from SlickText modifications