Bug fixes - Fixed interface