Fixed broken features

Change-Id: Iacf5b0a80fa95dc5d293f23588f01dde306b7e7a
Signed-off-by: Mathieu Lemay <mlemay@inocybe.com>