Base fixes