Fix some code quality violations

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>
Ensure the runtime before application order.

Signed-off-by: Clement Escoffier <clement.escoffier@gmail.com>