Fix last broken features and a bug