Update some files from thalamus kernel