Some small changes due to content implementation...