General fixes

Signed-off-by: Henrik Porseland <henrik.porseland@b-reel.com>