Misc

@iuliachiriac please review and merge.