#311 - fixing some issues with external security