Initial fixes - For testing