Fix last commit + more Options

Change-Id: I4a3b174c3308e6f5ccbe40b702837e31b924165c