fix few issues
Merge branch 'mbryja' into test