Minor updates before component refactor