Fix some stuff for Atlassian env