Fixes interfaces