Added explicit keywords to ctors where necessary