Bootstrapper, minor entity fixes & composition fixes